Manual merge of version 4:6.3.5-1+rpi1 and 4:6.5.4-1 to produce 4:6.5.4-1+rpi1
authorPeter Michael Green <plugwash@raspbian.org>
Thu, 23 Apr 2026 10:59:51 +0000 (10:59 +0000)
committerPeter Michael Green <plugwash@raspbian.org>
Thu, 23 Apr 2026 10:59:51 +0000 (10:59 +0000)
1  2 
debian/changelog
debian/control
debian/plasma-widgets-addons.install

index 592751cb8442782930610c231975af81a311fe42,528109e709da2b2110a1c5078d972191c8f1b1a1..4d6eb50bbb064bc7b1eef7667cd67e8412923c78
- kdeplasma-addons (4:6.3.5-1+rpi1) trixie-staging; urgency=medium
++kdeplasma-addons (4:6.5.4-1+rpi1) forky-staging; urgency=medium
 +
 +  [changes brought forward from 4:6.3.4-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 17 Apr 2025 12:30:59 +0000]
 +  * Remove armhf from qt6-webengine architecture lists.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 31 Jul 2025 03:53:00 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 23 Apr 2026 10:59:18 +0000
++
+ kdeplasma-addons (4:6.5.4-1) unstable; urgency=medium
+   [ Aurélien COUDERC ]
+   * New upstream release (6.5.4).
+   * Update build-deps and deps with the info from cmake.
+  -- Aurélien COUDERC <coucouf@debian.org>  Tue, 09 Dec 2025 20:52:44 +0100
+ kdeplasma-addons (4:6.5.3-1) unstable; urgency=medium
+   [ Aurélien COUDERC ]
+   * New upstream release (6.5.3).
+   * Update build-deps and deps with the info from cmake.
+  -- Aurélien COUDERC <coucouf@debian.org>  Tue, 18 Nov 2025 19:25:12 +0100
+ kdeplasma-addons (4:6.5.2-1) unstable; urgency=medium
+   [ Aurélien COUDERC ]
+   * Migrate to debian/watch version 5 syntax.
+   * Add/update David Edmundson’s key in upstream keyring.
+   * New upstream release (6.5.2).
+   * Update build-deps and deps with the info from cmake.
+  -- Aurélien COUDERC <coucouf@debian.org>  Tue, 04 Nov 2025 21:33:41 +0100
+ kdeplasma-addons (4:6.5.1-1) unstable; urgency=medium
+   [ Aurélien COUDERC ]
+   * New upstream release (6.5.1).
+   * Update build-deps and deps with the info from cmake.
+  -- Aurélien COUDERC <coucouf@debian.org>  Wed, 29 Oct 2025 18:25:46 +0100
+ kdeplasma-addons (4:6.5.0-1) unstable; urgency=medium
+   [ Pino Toscano ]
+   * Merge changes from 4:6.3.5-2.
+   [ Aurélien COUDERC ]
+   * Reenable and fix build-time tests.
+   * Drop Rules-Requires-Root: no, not needed anymore since trixie.
+   * Add patch to fix test failing on number representation.
+   * New upstream release (6.5.0).
+   * Update build-deps and deps with the info from cmake.
+   * Update the list of installed files.
+   * Adapt packaging to libplasmaweatherdata6 and libplasmaweatherion6
+     now being public libraries.
+   * Refresh copyright information.
+   * Release to unstable.
+  -- Aurélien COUDERC <coucouf@debian.org>  Thu, 16 Oct 2025 22:00:01 +0200
+ kdeplasma-addons (4:6.4.91-3) experimental; urgency=medium
+   [ Aurélien COUDERC ]
+   * Add missing Breaks/Replaces against plasma-workspace-data (<<
+     4:6.4.90~). (Closes: #1118033)
+  -- Aurélien COUDERC <coucouf@debian.org>  Tue, 14 Oct 2025 18:17:15 +0200
+ kdeplasma-addons (4:6.4.91-2) experimental; urgency=medium
+   * Team upload.
+   * Update lintian override to apply on any architecture.
+   * Ship /usr/share/icons/hicolor/scalable/apps/accessories-dictionary.svgz
+     on any architecture, and not only when QtWebEngine is available; it looks
+     like it is always installed now.
+  -- Pino Toscano <pino@debian.org>  Tue, 14 Oct 2025 17:51:01 +0200
+ kdeplasma-addons (4:6.4.91-1) experimental; urgency=medium
+   [ Aurélien COUDERC ]
+   * Reenable and fix build-time tests.
+   * New upstream release (6.4.91).
+   * Update build-deps and deps with the info from cmake.
+   * Drop backported commits now part of the upstream release.
+   * Add patch to fix test failing on number representation.
+   * Update the list of installed files.
+   * Add lintian overrides for the new libweatherdata.so and
+     libweatherion.so private libraries.
+   * Drop Rules-Requires-Root: no, not needed anymore since trixie.
+  -- Aurélien COUDERC <coucouf@debian.org>  Sun, 05 Oct 2025 13:28:06 +0200
+ kdeplasma-addons (4:6.3.5-2) unstable; urgency=medium
+   * Team upload.
+   [ Aurélien COUDERC ]
+   * Reenable and fix build-time tests.
+   * Drop Rules-Requires-Root: no, not needed anymore since trixie.
+   * Add patch to fix test failing on number representation.
+   [ Pino Toscano ]
+   * Update install files according to the newer kpackage, which does not
+     generate appstream metainfo files for packages anymore. (Closes: #1117351)
+   * CI: update/simplify configuration.
+  -- Pino Toscano <pino@debian.org>  Thu, 16 Oct 2025 21:00:25 +0200
  
  kdeplasma-addons (4:6.3.5-1) unstable; urgency=medium
  
diff --cc debian/control
index 22f52751aa87c5a46deed980e27185654b66dd2d,49f7c76aefd81bb74ddd0e8d51251fa45c6dcb08..cfa75fb980afd5e4f116e4f279de1c5e24e94ffc
@@@ -8,34 -8,39 +8,39 @@@ Build-Depends: debhelper-compat (= 13)
                 dh-exec,
                 dh-sequence-kf6,
                 cmake (>= 3.16~),
-                extra-cmake-modules (>= 6.10.0~),
+                extra-cmake-modules (>= 6.18.0~),
                 gettext,
+                hunspell-en-us <!nocheck>,
                 libicu-dev (>= 66.1~),
-                libkf6auth-dev (>= 6.10.0~),
-                libkf6config-dev (>= 6.10.0~),
-                libkf6coreaddons-dev (>= 6.10.0~),
-                libkf6dbusaddons-dev (>= 6.10.0~),
-                libkf6declarative-dev (>= 6.10.0~),
-                libkf6globalaccel-dev (>= 6.10.0~),
-                libkf6holidays-dev (>= 6.10.0~),
-                libkf6i18n-dev (>= 6.10.0~),
-                libkf6jobwidgets-dev (>= 6.10.0~),
-                libkf6kcmutils-dev (>= 6.10.0~),
-                libkf6kio-dev (>= 6.10.0~),
-                libkf6newstuff-dev (>= 6.10.0~),
-                libkf6notifications-dev (>= 6.10.0~),
-                libkf6runner-dev (>= 6.10.0~),
-                libkf6service-dev (>= 6.10.0~),
-                libkf6sonnet-dev (>= 6.10.0~),
-                libkf6unitconversion-dev (>= 6.10.0~),
-                libkf6xmlgui-dev (>= 6.10.0~),
-                libplasma-dev (>= 6.3.4~),
-                libplasma5support-dev (>= 4:6.3.4~),
+                libkf6auth-dev (>= 6.18.0~),
+                libkf6config-dev (>= 6.18.0~),
+                libkf6coreaddons-dev (>= 6.18.0~),
+                libkf6dbusaddons-dev (>= 6.18.0~),
+                libkf6declarative-dev (>= 6.18.0~),
+                libkf6globalaccel-dev (>= 6.18.0~),
+                libkf6holidays-dev (>= 6.18.0~),
+                libkf6i18n-dev (>= 6.18.0~),
+                libkf6jobwidgets-dev (>= 6.18.0~),
+                libkf6kcmutils-dev (>= 6.18.0~),
+                libkf6kio-dev (>= 6.18.0~),
+                libkf6newstuff-dev (>= 6.18.0~),
+                libkf6notifications-dev (>= 6.18.0~),
+                libkf6runner-dev (>= 6.18.0~),
+                libkf6service-dev (>= 6.18.0~),
+                libkf6sonnet-dev (>= 6.18.0~),
+                libkf6svg-dev (>= 6.18.0~),
+                libkf6unitconversion-dev (>= 6.18.0~),
+                libkf6xmlgui-dev (>= 6.18.0~),
+                libplasma-dev (>= 6.5.4~),
+                libplasma5support-dev (>= 4:6.5.4~),
                 pkgconf,
-                qt6-5compat-dev (>= 6.7.0~),
-                qt6-base-dev (>= 6.7.0~),
-                qt6-declarative-dev (>= 6.7.0~),
-                qt6-webengine-dev (>= 6.7.0~) [amd64 arm64 i386],
+                qt6-5compat-dev (>= 6.9.0~),
+                qt6-base-dev (>= 6.9.0~),
+                qt6-declarative-dev (>= 6.9.0~),
 -               qt6-webengine-dev (>= 6.9.0~) [amd64 arm64 armhf i386],
++               qt6-webengine-dev (>= 6.9.0~) [amd64 arm64 i386],
+                sonnet6-plugins <!nocheck>,
+                xauth <!nocheck>,
+                xvfb <!nocheck>,
  Standards-Version: 4.7.2
  Homepage: https://invent.kde.org/plasma/kdeplasma-addons
  Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kdeplasma-addons
index 128475ad2e628f4908335ac4568c593d667b017c,9b59fd80865c1747ec9e761c775c389db1070044..67db7ec2f85e64aca12ec0df480442f3212361d9
@@@ -1,16 -1,17 +1,17 @@@
  #!/usr/bin/dh-exec
 -[amd64 arm64 armhf i386] usr/lib/*/qt6/qml/org/kde/plasma/private/dict/
 -[amd64 arm64 armhf i386] usr/share/plasma/plasmoids/org.kde.plasma.webbrowser/
 -[amd64 arm64 armhf i386] usr/share/plasma/plasmoids/org.kde.plasma_applet_dict/
 +[amd64 arm64 i386] usr/lib/*/qt6/qml/org/kde/plasma/private/dict/
- [amd64 arm64 i386] usr/share/icons/hicolor/scalable/apps/accessories-dictionary.svgz
- [amd64 arm64 i386] usr/share/metainfo/org.kde.plasma.webbrowser.appdata.xml
- [amd64 arm64 i386] usr/share/metainfo/org.kde.plasma_applet_dict.appdata.xml
 +[amd64 arm64 i386] usr/share/plasma/plasmoids/org.kde.plasma.webbrowser/
 +[amd64 arm64 i386] usr/share/plasma/plasmoids/org.kde.plasma_applet_dict/
  usr/lib/kf6/kauth/libexec/kameleonhelper
  usr/lib/*/qt6/plugins/kf6/kded/kameleon.so
+ usr/lib/*/qt6/plugins/plasma/applets/org.kde.plasma.binaryclock.so
  usr/lib/*/qt6/plugins/plasma/applets/org.kde.plasma.comic.so
  usr/lib/*/qt6/plugins/plasma/applets/org.kde.plasma.grouping.so
- usr/lib/*/qt6/plugins/plasma/applets/org.kde.plasma.private.grouping.so
+ usr/lib/*/qt6/plugins/plasma/applets/org.kde.plasma.keyboardindicator.so
+ usr/lib/*/qt6/plugins/plasma/applets/org.kde.plasma.quicklaunch.so
+ usr/lib/*/qt6/plugins/plasma/applets/org.kde.plasma.timer.so
  usr/lib/*/qt6/plugins/plasma/applets/org.kde.plasma.weather.so
+ usr/lib/*/qt6/plugins/plasma/weather_ions/
  usr/lib/*/qt6/qml/org/kde/plasma/private/colorpicker/
  usr/lib/*/qt6/qml/org/kde/plasma/private/diskquota/
  usr/lib/*/qt6/qml/org/kde/plasma/private/fifteenpuzzle/